From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon, 15 Nov 2010 06:49:30 +0000 (+0000)
Subject: Merge branch 'drm-intel-fixes' into drm-intel-next
X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~15785^2~23^2~104
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=c94f28c383f58c9de74678e0f1624db9c5f8a8cb;p=linux-4.9.git

Merge branch 'drm-intel-fixes' into drm-intel-next

Conflicts:
	drivers/gpu/drm/i915/i915_gem.c
	drivers/gpu/drm/i915/intel_ringbuffer.c
---

c94f28c383f58c9de74678e0f1624db9c5f8a8cb